merge with xen-unstable.hg
authorAlex Williamson <alex.williamson@hp.com>
Tue, 15 Apr 2008 17:09:46 +0000 (11:09 -0600)
committerAlex Williamson <alex.williamson@hp.com>
Tue, 15 Apr 2008 17:09:46 +0000 (11:09 -0600)
commit923250b2c35be9d46e69facce22fe2f04d5e18a2
tree717fe03a04eb9fdbe2da4f13472be6740f8d5008
parent003499ac91203b8e2a7352deab00f46039983cd7
parent1eaea3f0b675f67f9ce3dc9a6f9e4b272c9d75aa
merge with xen-unstable.hg